Manual merge.
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Fri, 1 Jul 2005 14:32:22 +0000 (14:32 +0000)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Fri, 1 Jul 2005 14:32:22 +0000 (14:32 +0000)

Trivial merge